bitkeeper revision 1.1236.1.143 (4244ed8elupJI3lVFp62vEBqYUNJhA)

Remove some unnecessary flush_page_update_queue() calls.
Signed-off-by: Keir Fraser <Keir.Fraser@cl.cam.ac.uk>

diff --git a/linux-2.4.29-xen-sparse/arch/xen/mm/fault.c b/linux-2.4.29-xen-sparse/arch/xen/mm/fault.c
index 49a0afc887c553d07d70b2091767ebe6a60d43c8..7db6463e0924444a0563fde38a8844d47003f106 100644 (file)
--- a/linux-2.4.29-xen-sparse/arch/xen/mm/fault.c
+++ b/linux-2.4.29-xen-sparse/arch/xen/mm/fault.c
@@ -84,9 +84,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs,
         error_code &= 3;
         error_code |= (regs->xcs & 2) << 1;
 
-       /* ensure all updates have completed */
-       flush_page_update_queue();
-
        /*
         * We fault-in kernel-space virtual memory on-demand. The
         * 'reference' page table is init_mm.pgd.

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c
index 6548508baec08b8abbd64735f50674770ce25743..f27dc20c7f139814414e2a010bd239bb2a0f9e3e 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c
@@ -192,7 +192,6 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base)
                                }
                                pte_ofs = 0;
                        }
-                       flush_page_update_queue();
                }
                pmd_idx = 0;
        }       
@@ -359,9 +358,8 @@ static void __init pagetable_init (void)
        queue_pgd_pin(__pa(new_pgd));
        load_cr3(new_pgd);
        queue_pgd_unpin(__pa(old_pgd));
-       __flush_tlb_all(); /* implicit flush */
        make_page_writable(old_pgd);
-       flush_page_update_queue();
+       __flush_tlb_all(); /* implicit flush */
        free_bootmem(__pa(old_pgd), PAGE_SIZE);
 
        kernel_physical_mapping_init(new_pgd);
@@ -564,7 +562,6 @@ void __init paging_init(void)
        zone_sizes_init();
 
        /* Switch to the real shared_info page, and clear the dummy page. */
-       flush_page_update_queue();
        set_fixmap_ma(FIX_SHARED_INFO, xen_start_info.shared_info);
        HYPERVISOR_shared_info = (shared_info_t *)fix_to_virt(FIX_SHARED_INFO);
        memset(empty_zero_page, 0, sizeof(empty_zero_page));

diff --git a/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c
index 89154d457698af8f8fdab6ea01e777a457d9bc00..91fe4e59754b3be91b53e10b166a3b5ec49fd9d0 100644 (file)
--- a/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c
+++ b/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c
@@ -387,12 +387,6 @@ static void network_alloc_rx_buffers(struct net_device *dev)
         rx_mcl[i].args[2] = 0;
     }
 
-    /*
-     * We may have allocated buffers which have entries outstanding in the page
-     * update queue -- make sure we flush those first!
-     */
-    flush_page_update_queue();
-
     /* After all PTEs have been zapped we blow away stale TLB entries. */
     rx_mcl[i-1].args[2] = UVMF_FLUSH_TLB;